Drop “gtk+” plus sign in GtkBuilder <requires>.

diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui
index 5826f41d449a3ced6e1c76421311a9b94e5a3f94..47af972b889d35abeeec7123311ab1961486dd7f 100644 (file)
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow" id="window">
     <property name="resizable">0</property>
     <property name="title">CSS Blend Modes</property>

diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index 2f1f00fcb1230e0c78265b24edd8bf9ecde5d9c7..9a5912053dc420e1557eecebc8c604ab82bd335e 100644 (file)
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gint"/>

diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index 1099cd08d0f7f6f9471fa9c52957eac949e22421..81438c42814c10fcbde22b59d51a681a585b35f9 100644 (file)
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window">
     <property name="default-width">600</property>
     <property name="default-height">500</property>

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index b6663126cffd8337af9f610ef805dc744462811b..ef1237fccc0471aa25957b4462411478c727ee14 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -71,7 +71,7 @@
  * element contains an `<object>` element which describes the child object.
  * The target toolkit version(s) are described by <requires> elements,
  * the “lib” attribute specifies the widget library in question (currently
- * the only supported value is “gtk+”) and the “version” attribute specifies
+ * the only supported value is “gtk”) and the “version” attribute specifies
  * the target version in the form “`<major>`.`<minor>`”. The builder will error
  * out if the version requirements are not met.
  *

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 66ff6981a73c55006e20fad89f6437cd3405488e..c8e096aacb6567ebacb0b9570dbb03095b277761 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -2014,7 +2014,7 @@ end_element (GtkBuildableParseContext  *context,
        * required versions, possibly throw a signal allowing them
        * to check their library versions here.
        */
-      if (!strcmp (req_info->library, "gtk+"))
+      if (!strcmp (req_info->library, "gtk"))
         {
           if (!GTK_CHECK_VERSION (req_info->major, req_info->minor, 0))
             {

diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 98460819b1de463761501970adb76b7d0b8c51a9..e15cf294ca4f1ca1cb26a87d331d73e6ff8b0fd6 100644 (file)
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkListStore" id="completion_store">
     <columns>
       <column type="gchararray"/>

diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 915d20a189fb4d5607d96aa92b492b438f9c6350..e3e34adf1fb4de41a0bd88246665e920b6cf01ef 100644 (file)
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
     <property name="width-request">100</property>
     <property name="child">